[backfire] merge r24022

SVN-Revision: 24025

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 50f4178ab4a80518b6323955f0ce419d869f9fdb..f5d3dfc84d7dfed62477245bf3a4080c1b98c52f 100644 (file)
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=7
+PKG_VERSION:=8
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk

diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 2af1f74b297c744f2886817661f8f9156e13f387..5f8dfffe5785913db4b0308c2fd44d8f2b35cbb4 100755 (executable)
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -42,6 +42,9 @@ setup_interface_6in4() {
        local ttl
        config_get ttl "$cfg" ttl
 
+       local metric
+       config_get metric "$cfg" metric
+
        local defaultroute
        config_get_bool defaultroute "$cfg" defaultroute 1
 
@@ -70,7 +73,7 @@ setup_interface_6in4() {
                uci_set_state network "$cfg" ip6addr $local6
 
                [ "$defaultroute" = 1 ] && {
-                       ip -6 route add ::/0 dev $link
+                       ip -6 route add ::/0 ${metric:+metric $metric} dev $link
                        uci_set_state network "$cfg" defaultroute 1
                }